Cleaned up some, added some functionality for gameplay to player object