Updated Makefile and made progress on Categorized.