working towards #70