Start refactoring code, add plethora of TODOs