Working on categories

In progress.