Finished Week 7 Completely

Currently just need to refractor the code to look better. Everything is
now functional.