First commit to this branch. A lot more work to be done before merging.