added the categories, the test for the options...