Should be done with minimal breakage... testing phase now.

Applies to #264