Made more changes to retrieving data. Decided to go with another approach. Added some TODOs