Testing marker locator
Testing marker locator
Cleaned up code