WIP: Preparing categories

#134