Last checkin included some unfinished code.  This checkin updates the repo with a version of two files that now compiles correctly.