More functionality moved onto game