Now it compiles, at least