Some clean up work and introduce some new components.