Going to merge this now, we can do auto-starting in another pr as you suggested.