Added instrument support to state, menu selection, and file saving
Resolved conflicts