#19 Got some of the new unit tests to pass. Still  some more to go.