Proposed impl. for next-gen of waterline  DONT USE IN PRODUCTION