Fightingteam

One final merge to get our code working on master...