Start extracting logic to views
introduce actions
Add complete action
Mostly complete transition to views