Fixed all grader issues
The final product