Started moving most of main.c work to a new utility library...