Boats!

This pull request does boats.

No idea why xoft's stuff is there...