Changing permission types

NOT YET finished.
Minor changes to function names as well