Some tweaks that go along with some API factoring to provide more data in a single query vs more queries to massage data after the faxct