Your idea, beautifully built.
Generation model
Your main screens first. Redesign each one, then add the real functionality.
Lily