Final commit for this assignment, everything works as needed. That only took a day.