Fixed distance calculations, got model running