Appears everything is working

Still needs some tweaking and cleanup, but I'll want a commit point
before I start removing things I think I don't need.