John & Church Street Upgrade