River-container-core now builds.  The unit tests run correctly (nothwithstanding a few tests that were in the RiverSurrogate project that are now commented out because they were exploratory in nature).