Beginning to abstract away an Instrument class, last commit before changing working code