Standalone mode working

Required a little rework to remove all the code from the base file, but
it now contained in runner. Where it should be.