further abstraction + interstitial + other misc changes