backup
merged
updates
updates
Final commit before presentation!  Javascript works, but need to reformat for readability.