stop the rebase madness -- branch edition
missed some stuff on this branch