Added some todos for resuming work later on