Started adding formula handler for calculations