got distance working
fixed merge conflicts