Back to main features.

Moved experimental stuff to TestPlayer.