First pass done.  Ready for testing.