Mid-Class Commit

Data-Interchange is the main problem, others are pretty much resolved.