Brought things to minimal compiling codebase.