Some more updates (still not compiling)