adds watchposition
fixes conflicts
Merge pull request #6 from jhath16/justin-branch

Justin branch