Refactored Game 2 + some bug fixes
Fixed bug (ready for deployment i think)