Switching to a more generalized, context / pipeline only structure