begin the big refactor
Merge branch 'master' of github.com:sharismlab/battlefield