Ready for Submission

Ready for submission.  Could use some tweaking in the coming weeks, but
all the needed core functionality is there.