Merging Sprint 8 Feature Task Show into Sprint8

- Caught up to sprint 8, refactored to work with sprint8 tip. 
- Resolved issues in merge, and moved to a fresh branch specifically with the merge.
- Merged new branch into sprint8 again in case I missed anything.

Ready to merge.