working on #786 just categories done