Slowly working towards #303