changing around things with the way RiverModelCL class works, squash this later