Added todos to a few files