add a proper test or two, toolkit experiment