Took a stab at this, issue #69