minor nitpicking, was thinking cat_id would match the other naming schemes more, but not enough to block the merge