I moved some stuff
Updated program to reflect moving stuff