Added some stuff... have warnings, lots missing.  I tried...