Remove crud from init script
Add instrument wrapper
Instrument creation