Merge gamelogic into gui