First steps towards #5