Removed shortcut
Added check for grid
Decoupled interface from london.shp