Moved waterline into lib.