Reorganized, added Player Object