Added initial version of post_watershed (not yet complete)