Commenting out the test section for now
Adding category field
A few fixes