Fixs install script bug
Another design attempt
The master has a bug fix that needs to be in this branch