fixed the grand finale! So far, all tests pass, but hasn't been tested in irb yet