Remove some test code, add in some color formatting, add in some categories.