working towards #199