Merged IO Updates

Merged Paul's IO updates into the combined source file.

Future work should all be done on the combined source file.