Frontend for #87
Code changes for #87.