Feature/task36

HI Trey,
Please have a look on the permission function for task  #36