working: marker updating to current position.

This really needs to be tidied up.