#7 Add states, visual improvements