Hammertime next generation

 * Added more CAT API awesomeness
 * Replaced some of the boring queries with fancy aggregations
 * made queries simpler / less optimized for easier understanding