refactored callback and added battleship manager