Pretty much finished the assignment