Finished implemented mappings; corrected the permissioning model