Big update to how categories work - now many to many