Rewrote to benefit from code reuse.
Rewrote to benefit from code reuse.

mangalam-research/wed,mangalam-research/wed,slattery/wed,lddubeau/wed,mangalam-research/wed,mangalam-research/wed,lddubeau/wed,slattery/wed,slattery/wed,lddubeau/wed,lddubeau/wed