lots of changes, beginning of parallel, basic catchup