First attempt at next version of #70.