Finally done. woot. All is working, still need to delete unused code from master branch and merge with copy on machine