Added moving 'You Are Here' marker
Changed Nishok's naming convention.