Gh71 categories  (with code review modifications)

#71