#14 Complete the category management