Initial commit
a bug or two still to squash
merging hopeful
seems to work