Figures moved into class Figures