we should be able to get away with leaving all this stuff out since we're catching anyway