Moved around TODOs, added a couple options for findAddressFields