At bug -.-
Merge branch 'AddMedium'

This is the current state as of the Sprint 1 demo