cleaned up a bit and about to add multiplayer