Adding player model/restructuring some code