All current functionality working and all tests passing for refactored Categorizer class; Ready to add logic to take secondary tags into account