Still working on categories

It takes a while...