adds more play functionality
resolves conflicts
Adds more functionality