moved instruments around for testing
Merge branch 'master' of https://github.com/PFCM/Control

More back and forward with changes made on server. This is getting awkwardly twisty.