WIP: Preparing categories

#134
remove.