PLEASE FIX: @erichpleny OO Design Issue on MediaSource keeps breaking the app. Too hard too maintain.