Passes most tests now