Added the infrastructure for incremental output, not yest tested