Still not sure if I like this Waterfront extension…