The latest changes I have made committed to the master branch. The master will be forked and Cannon's changes will be merged