Feature/oonib support

Going to use this branch to keep track of the work necessary to implement #109