Revert "Mashup is being goofie. going to make movie and come back to this."

This reverts commit 91d6f4e17ddef61283f483f2ed7d1bae6435a3c5.