Begin refactor
First hint of testing framework
Added more structure