Revamping the East River Waterfront: A Multi-Faceted Plan