Mixed some stuff around, ditching categories.