Commit before adding logic for permissions and json