almost done getting at to work again
at running
Merged with changes from Roger via Joe