Added CLI stuff, more robust
Playing now comes from not playing to playing