Towards addressing #14