incremental demo basically working