Add simple todos to be fixed.