Mpuncel/stop

@anthonybishopric 
we should think about this, but maybe not necessary at the moment to get a working prototype