Updated OIP parts of implementation to almost done.