Lots of updates

Updated many files.  Almost completed phase 1 of project.