Version 0.89 - more tests passing