Started main body of program

Also resolved a conflict
Started main body and resolved a conflict
Started main body and resolved a conflict