Update the files with my latest changes from the -dev branch. This is mainly permissions changes rather than code changes