Reworking
Working, but ugly, version of game