Working on markers
reorganizing