Changes across the board. warning: does not compile yet.