Added new figure
Save for the night; almost done...