Commit before trying a fairly drastic re-work
rewrite failure...
working port selection and restart