Need to add some OOP
Merge branch 'master' of https://github.com/bobishh/fresh_start