Major re-upload

Now compiles