Change to D3 and updating church code. Not yet functional.