Many changes; ustack work beginning