Glridb 315 integrate catchments into portal

Awww yeah! Making it generic! Nice.