WIP: further breaking out old code into instruments