initial commit for issue
extract water report to a directive
first version of report water