Also added some changed to these files.  Did not commit with the last batch for some reason.