Older untracked code changes, add support for multiple categories
Merge conflicts