Initial implementation of rivers