Implemented basic riversmap
More reviers
Merge branch 'riversmap'