Rewrote large amount

Made a few large changes after watching the video from Tuesday.
Commented out old code for now since I did not have internet access
while working on the code and did not want to lose it in case I needed
it.  Will remove on next commit.