all: restructured to simplify parsing. made it concurrent as well.