Initial commit

Committing work so far, still more to be done