Reformatting TODO to be grouped into categories