Add 'skip recording, just play' feature, refactor