First stab at proper components.