expand (now I have a working implementation for categories, at least)