Added todo functionality