initial setup for the water point project
merging