Killpack/friends

This depends on stuff in #33. Once that's merged, this PR will look a little cleaner.