Restructure.
Add UI and CLEAR.