Added start/stop + some delegate stuff