Work on Acl refactor and examples