Began further breaking up the program and rewriting