Partial checkin for rivers class

Initial checkin for rivers class. Hasn't been tested and is missing draw
support. To be added soon.