Change Clearing to use sub-components
Add f-joyride and f-stop components