Missing changes from marvin branch
"Finished" install script.

Not elegant, but it works