New ACL model should be complete now. Needs testing.