add categories, and set some TODOs