work on #62, just need test to close