Expanded the program, again having some fun