start revamp ControlCollection API
working on improved API
Finish modularizing code
Merge branch 'modular-rewrite'