Restructure code a bit
Added play/pause methods