Working on distance calc