v 0.32; case class refactoring almost done - need to replace debug prints with unit tests