Made more changes to I/O
Nearly finished I/O conversion
I/O change, including tests, changed and passed.