Abstraction Progress

Broke interchange in order to add more abstraction to in later.