WIP on Waterline Collection integration.