Okapi connector v2

Can you merge this to master?