Address #13

Not exactly a fix, but some progress towards it.