Fixing Things up
Now compiling