Pushing the changes I made for Friday's assignment