First commit. Autoplay works (for the most part) but manual play is still a work in progress.
Fixed merge conflict