Merging Sprint 8 Task Show into Sprint 8

This should be ready now.  I've tested a merge on a fresh branch.