Checking in work in progress. (Does not build [yet].)