Switch View re-do.  Up to 'implementing the content views (pg.165)'