1st waterbase build (Work in progress)