Unfudge 3 now passing tests, thanks to timotimo++