work towards getting #204 done