Merging changes back to master. Seems to be in a state where the permissions were wrong. Creating a new branch to merge back to master