Fixed more plumbing and a lot of sinks - many more tests passing, and checked while my brain is capable of DST/datetime math.