Another rewrite of aitown-dstorage