sweeping changes

probably for the best, but safety first