Added prints of values onto the figure, but still need to check TODO's