Added permission stuff and viewing