More efforts to debug
I'm getting weird bugs with the deserialization, but this is being sidelined until after the presentation.

Committed by: Alec Thompson - ajthompson