(master) WIP trying to address issue #7. Didn't actually work...