Plays refactor

More complicated that hot, but should all be there now.  Minor fixes for quoting this time ;)  Going to wait after hot gets merged to see if there are any conflicts here before moving onto more.

Thanks for quick turn around on search!