Started overhaul of the figure system.

Still lots to do!