Draft commits for initial implementation of ocean and ship