DS product and category closes #24