It works, but tests get SIGILL
Fix formatting, fix crash. One unit test still failing.