Finalized my phase 2 code, still needs to be tested