Play23

I'm unsure how you want to manage this... may be it should be maintained as a separate branch to master. What'd think?