Cleaned up and streamlined code, enabled io for use with eddy1