Fixed a heaping pile of weirdness.  Rebuilt bundle