Gets issue #83 started -- needs testing