acl working now but code needs cleaning