First commit with countries working