Final steps for basic imp of #143