Instrument factory horrible implementation

+ should be re-done entirely!