Added some calculations for probabilites, added inheritance for figure, more skeleton code