Now compiles and passes tests on linux