Added todo funcionality