More work refactoring the play method