Fixed errors from changes. Compiles and runs