Messed up code now re-writing it modular after this
Merge branch 'master' of github.com:darkyen/projectx