Migrated in more calculation functionality from kenyaemr