Began transferring code from the "celtic" R&D version.