More configurability and some work on boat motion logic