Starting to redesign the base components.