Ongoing work: More additions to main.c