Desgign stuff for river. Closes #5