Cleaning up code and making it more OOP
Merge branch 'master' of github.com:sebleedelisle/interplay