Shaun/new

Removed ISR
Removed high level functions