Lots of changes
Been awhile
Huge changes
Almost perfect
Merge branch 'feature-nomodel'

Conflicts:
	hydro.py