Splitting up the fight calculation in different layers #1

Open
Hecht wants to merge 3 commits from foo into master