Work on fight class