Added more of the program structure.