Refactored collection fetching, and finished Categories