this commit either a) Closes #598 or b) kills us all. Hold onto your coconuts.