Done, will push together with currency converter.