Took all of the 'self.' out from in front of the attributes being assigned