First  go at bringing OCL in