Integration stuff.
Merged with Iteration-6 branch