Fully Functional

Everything works and looks correctly. I would like to take one more
pass to clean it up for better structure and readability.