Started re-working for ToDo Genie app