Fixed registration bug and added UNTESTED battle code. I would have tested it, but there is no way for a battle to occur yet...