i think this is done? #167

can @ianb and @gregglind confirm please?