Big changes - refactor, added delete, added ACL, other things too.