Changed parsing to utilize a list of blocks