Part 1 of move from map structures to numbering the blocks and instructions wherever possible.