crazy lot of commits in here.  let's see if i only get 1 issue?