In Class Changes

Changed code based off of what was discussed in class