Commit of holiday work

All the work I did while away:
*Making the game more object oriented
*Using said objects