Moved step 1 to claims controller