Got much closer to resolving #40, but need more time.