After 18 months and two consultations Martinborough has agreed on a development plan for its town square.
South Wairarapa District Council agreed on the plan last week, which will see the old courthouse moved from Cork St to between the museum and the playground, and a new toilet block go up next to the museum.
Plans also include planting and seating around the Boer War Memorial, picnic tables, improved lighting and historical information on plaques on existing structures around the square.
The four original settlers of Martinborough will be recognised with a native tree in each of the corners of the square and a plaque. The roses near the Boer War Memorial will be replaced with shrubs, and the three remaining Peace Roses will be moved to their own garden.
After opposition, council have agreed to not widen the promenade, but will upgrade the existing paving.
The council received 36 submissions on the development plan, which sits alongside a reserve management plan which lays out rules on the square's use and development.
The Martinborough Town Hall was considered separately.