Messy implementation of river content completed
read previous commit