Inbetween, will finish in a bit
Fix #678
Partial fix for #637