Refactoring, tests may fail
MAJOR refactoring session. Lots of stuff changed.
Major cleanup
Merge branch 'refactoring-micsmanager'