making progress on geribil+q+exceptions