Completed

Done, for now.  This is a master commit of the first working version.