Now incorporating distance, need to iterate with it