Added start and end locs
Damnit