Some further updates, still not compiling.