and come full circle back, integrate zbot-classes back in

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>