Modify logic

Parse blocks, now need to debug it