progress on rerwrite engine