Starting ot merge find and map.php