General Clean up + Battleship Class

This commit will error until a commit from nathe is in place