Adding functionality to calculation

YEEEE