Refactor, finished initial game loop