WIP: Preparing categories

#134
move to another file.