WIP on fetching new data correctly