Fixing Stuff, code compiles now