code reorg
lots of reorg, parsing blocks like a bau$