Updating code to the state that it compiles
9 files changed