Full pass through and clean up. Getting close to RC1