Attempt to make scripts more rugged
Merging with laptop