Fin!

Finish step 7 of the semester project, need to tweak a bit for output
wise