Started implementation of #20.