Use new deployable diddleman. Need to fix categories