Ziv makes a bunch of changes.

Ziv realized that he should make a new branch probably, so he's doing that now.