Update to spec and Category class.

This commit now has 2 test passing. The second test isn't quite there
yet.