Another massive commit, changes required from Builder. I'll try to stop doing these gigantic commits