Add a progress indicator
Add button tests
Combine two of the button types together