Step 1 Done, need to debug