Updated to-do

We need to refactor some stuff
Updating?