new player model and weapon logic
Merged stuff