Finished (I think) main pass on all figure functions.