Stuff for fights
Merge branch 'JD'