add cats
restructure vars into dict