Updates of the WIP to Oren.

This is the WIP I showed you.