More re-factoring,  build a status string instead of writing to the serial console