Refactored, and play button completed