* Removing a bunch of TODOs
* breaking out SQL for adding the Term Resolver