Added comments, still fails and need more test cases?