Add boats module
merge