Councillors in Edinburgh have approved a multi-million pound redevelopment of the docks at Leith.
The plan aims to develop major areas of Leith
The 15-year plan will be the largest planned extension of the city since the 18th Century.
Up to 18,000 new homes are planned for the 170 hectare dockland site, including flats and terraced houses.
The plans show a development the size of a small town, including facilities from libraries and schools to offices and shops.
Councillors said that it would be the biggest planned extension of the city since the New Town in the 1800s.
The development framework has been prepared by Forth Ports plc and the council, following local consultation.
Several new schools are likely to be required, including a new secondary school.
As part of sustainability targets, the feasibility of a combined heat and power plant for the area will also be considered.
The target for on site renewable energy regeneration will be at least 10% of predicted energy requirements.
Councillor Trevor Davies, convener of the planning committee, said: "The views of local residents have been invaluable in developing this framework, and we made many adjustments to the plans following comments made during the consultation.
"Local people will continue to be asked to comment and give feedback as the developments proceed over the coming years."
Terry Smith, property director of Forth Ports, said he wanted the area to become a new waterfront heart for the capital.
Mr Smith said: "Edinburgh was originally a number of villages, which combined to become the capital city that we enjoy today.
"We have planned the dockland regeneration in a similar way, where a number of new villages will be created, each with its own individual character and setting.
"The villages will respect the extensive history of the area, but also look to a new future."