Initial working implementation
Merge pull request #1 from dpwspoon/develop

Initial working implementation