Reworking to support only getting data once

Completed a few TODO tags related to condensing function calls as well