Progress on improved block parsing, tracking pr

Redoing all the things. #25