A huge regeneration of Leith Docks featuring 16,000 new homes has been unveiled in the largest planning application in Edinburgh's history.
The site would be transformed by buildings and marinas
Forth Ports, which is behind the plans, hopes the 30 year project could create about 12,000 jobs and turn the city into a "world-class" destination.
Nine "urban villages" are proposed with the first one to be placed beside Ocean Terminal.
A commercial, retail and leisure centre would be at the heart of the area.
The application, submitted to Edinburgh Council on Tuesday, outlines how the 144 hectare brownfield site would be transformed through a mixture of residential, community, leisure, retail, business and industrial developments.
The document sets out a clear vision to create vibrant and active street life that would encourage walking and cycling as the main forms of transport with provision for links into new public transport services throughout the area.
The development would also feature more than 100,000 square metres of new office floor space, which is thought would contribute an additional £194m a year to Edinburgh's economy, and a further £240m to the country's coffers.
Charles Hammond, Forth Ports group chief executive, said: "The Leith Docks outline planning application is one of the largest ever submitted in Scotland and will lay the foundations for the next 30 years of development in Edinburgh.
Parisian-style cafes feature heavily in the plans
"This development creates an excellent platform for the private and public sector in Scotland to work together to take the capital city forward.
"It will regenerate the entire Leith Docks area and re-connect the waterfront with Edinburgh.
"As well as delivering further regeneration of the waterfront area, this project has real potential to make a huge economic contribution to Edinburgh and Scotland."
Jenny Dawes, leader of Edinburgh Council, said: "The waterfront is our opportunity to create a new destination within Edinburgh.
"I want to see an area that appeals across the board to businesses big and small, provides a top class mix of leisure facilities and a range of housing that is suitable for all.
"I look forward to hearing the detailed proposals of this outline application."