The municipality developed new areas such as Ullevål garden city (1918–1926) and Torshov (1917–1925). City Hall was constructed in the former slum area of Vika from 1931 to 1950. The municipality of Aker was incorporated into Oslo in 1948, and suburbs were developed, such as Lambertseter (from 1951). Aker Brygge was constructed on the site of the former shipyard Akers Mekaniske Verksted, from 1982 to 1998.