Refactored strategies

Just wanted to pull request this because it changes some fundamental things. Will use a different branch to add a WeaponFactory. Please delete this branch