started refactor towards more testable code base
started writing REAL small modules.