Move last functionality out of game controller