Refactor to be more like IrisSharp