Basic testing working on the cleanup
Splitting up monolithic code file