Still working on distance checking