Main.c test branch1

There are new comments that everybody wants, so please pull this in.