Start adding incremental read/write support