Category and Comment Support

Untested