Renames and finishes assignment 2