Added todos to 1.2