Add dict TODO, starting to get scared by just how much code there is (and the super extensive use of MACROs)