Added toggle(), pause() and play(). Also begin to implement waitTime updater