Changed some names, added start/stop methods.