Step 2 and Step 2 Review

step 2 and step 2 review are completely done. May need some further
testing but from what I did, it  works well.