MEDIUM / Foundation refactoring / compiles now