First steps towards #70