Implementation changes

- Add moveTo feature
- code fixes