Got most tests passing.