Fixed some problems with new_Main_with_timer.

Also planning on moving some of the testing code into this script.