Recalculate functionality added, still need to test