Added todos to be completed later today