[DO NOT MERGE] research work on #61

Just opening an official pull for @wsnook's `issue61` branch as a possible way to fix #61.