stash first changes for #838 until I or someone else can get back to it