NPC class added
Joystick back in