make starting/stopping work properly (but with dumb non-dry code)