Rectification - A Complete Redesign of XCom