Added TODO's for what needs to happen with the formatting of the query