feature/deck-view

Creating this PR for Hassan's deck view branch. -Artie