implement new fight stuff