Initial commit.  Merged from my other repo, but this deserves its own repo.  Continuing work from here