This is just to track my work on implementing #147. There's some discussion on this already on #231.