Checking in some changes. Work in progress.