Seems to be working with the manual testing that I've done.