Preliminary work for #2