sweeping changes. Here's hoping for some easier vim'ing