Adding todo features