Gamelogic

merge so the ui guy can have a proper board