Draft version of issue72 implementation.