Update Battle and Ship
Fix TODOs in Battle and Ship
Update Battle and Ship
Fix TODOs in Battle and Ship