Added some todo points