Work on adding todos to categories
Remove old code