prepping for selector pattern
added play pause functionality
removed old functions
added merge diff
minor update