first version with map working