Initial commit of ZoneId solution