Fiddled with input handling and add class Weapon