Other Half Commit

WTF WHY DID THIS NOT GO IN WITH MORE WORK - this is the other half of
the files.