The Integration Patch

Here be the final patch before integration. "Duh duh dunn!"