Restored the codebase back to a compilable state