Added todos and text