The Hydropathic are now part of the campus of Edinburgh Napier University. During the First World War, the hospital was used to house officers suffering from the symptoms of shell-shock. Invalids here included the poets Wilfred Owen and Siegfried Sassoon, who met while patients. After the war this the building served as a convent and then a theological school, before passing to the then Napier College. The area became part of Edinburgh City in 1920 and consequently the area was developed in the 1930s, largely with bungalows and low density housing on the low-lying ground around the Wester and Easter Craiglockhart Hills. Approximately at the boundary point between Craiglockhart and Merchiston runs the Edinburgh Suburban railway line. There was once a station just off Colinton Road, and this may return, since the line is mooted for re-opening as part of Edinburgh's future transport strategy. Not until 1899 was Craiglockhart granted its own church, designed by Hay and Henderson, technically a quoad sacra church linked to Colinton parish. Its first minister was Robert Walker Mackersy (1833-1902). He was replaced by Alfred William Anderson (b.1869) in 1903. Craiglockhart today is chiefly residential, with a small proportion of commercial properties, and is in general considered to be a comfortable middle-class area, with a mixture of terraced and detached villas, of a variety of ages. Ethnicity Attractions and amenities Craiglockhart Tennis Centre plays host to large international tennis competitions, with a series of well kept indoor and outdoor courts. One famous product of the centre is Andy Murray, who often trained there. On the same ground is Craiglockhart Sport And Leisure Centre which has a small boating pond (built as a curling pond in 1878). A small cluster of commercial premises remain close to the station site, with a further group located opposite the Craiglockhart Tennis Centre. A small Tesco "Express" supermarket has been built on the site of a former petrol station adjacent to the Meggetland playing fields. The opening of this branch of Tesco was vociferously opposed by the Scottish food writer Joanna Blythman, who claimed that opening the store would damage the local grocery store at Happy Valley. There is a Craiglockhart Primary School, although this is a little to the north of Craiglockhart itself, technically within North Merchiston (though commonly described as within Polwarth or Shandon.) References External links Bartholomew's Chronological map of Edinburgh (1919) Craiglockhart Community Council Craiglockhart Primary