Added categories to lists. Needs style improvement. Good for now. Bug #14