Much better handling of the io everywhere. Delete wacky macro.