Refactored out old play view stuff