cleanup
state machine
UI update
V 0.1.0
Q2