Added todos and the like