Started adding map but buggy