Save point.  Rearranging javascript slightly