still mostly setting scripts up
Merge branch 'master' into master-experimental