Finishes Categories

This update finishes category implementation.