working! just had calc data to do