Closes #140 - Swap  with oboe implementation