More game loop stuff
merge