Do a lot of work on adding more figures.