rewrote a bunch of stuff in church