Partially fixed permissionissues, need more work!