Updated and ALMOST compiles