[Sam Bauers]

Yes, similar, but more complete. I changed all the category function names (basically appended “bb_”) to meet the new guidelines and in turn fix this issue.