Fixed the main controller collaboration. Drove a few interfaces and classes.