Even more work. Still not compiling.