Program working again

Worked on this at school to get it working. In the future, only add code
if it works. If it doesn't, comment it out so the program still
functions