Work on finalizing the new refactor of the Acl/Nav functionality