Merge pull request #7 from dstavis/ashwin_views

boohooohooo
almost finished for pres