Name change, separate class file for player, moving methods, dryed up