Integrate changes from last meeting and work some more on it.