Working code for grading
Working version for lab1