Add in things that changed from the original. First commit was to see the diff.