refactored: moved marker stuff