Better Medium matching; TODO - Remove all greater/lesser/conditional medium configuration and re-asses