Merging in changes from Brad Frost

Thanks to Brad for all his work and exposure. Let's see if we can get things moving again.