Feature/initial category

@wnagrodzki asking for merge