Late night testing and file fixing.  Needs to be redone.