Lots of cleaning, need to come up with a better way of doing dynamic categories