WIP: Preparing categories

#134
remove any hardcoded stuff