lots more cut and paste.  really shouldn't need it (and the @state stuff definitely shouldn't be needed)