created part of an outline for the game
fixed merging issues