Wrote code. Needs debugging. 2 out of 8 tests pass
resolved merge conflicts