Working on making the output more consistent, e.g. return 0 if OK