Lots of changes to get _run_me to work