Done with the first part of the assignment