Fig to Gra
Gra to Dra (I hate graphics)
Separate the Dra to Pic mapping from the Dra definition