Pull request for half-commits

Yay commits that were cut in half