removed some commented out code
Nearly completed i/o update, still working, but needs a little bit more work