additions from class

if you want the changes we did in class, you can merge this, or not, up to you!