New stuff! Also get pagination/category pages working again