WIP: Preparing categories

#134
move comment above.