WIP stage 2 errors

Hit a snag wrt implementing PerSite and HasPermission on Party