main_view_setup branch

Matches issue #7