Pretty sure @colemanw has over-hauled this file in 4.5