Added todo
Initial pass of improvements and fixes for latest waterline build.
All tests pass.