Categories now fully implemented. Next step is to make them show up in layout.