Work on the refactor/acl