Fight

Fight is complete, merging to master.