Passes all the simple tests.  Need to try it out on long-time runds