Today marked the beginning of work on the 2.0 development branch for Cinemon. 1.0 still has lots of items to deal with, but I've now begun work on the features planned for release 2.0. Most of today was spent refactoring the test framework to allow for generating MockCMTS that can be scanned by the new code. After that, writing the actual scanner code was fairly straightforward.