Refactor in preparation for the addition of an admin site.