Initial work for #152