Probably better overflow logic. Going to have Sean test this.