Add code from feb 12 class
Add joselyn's code

Weird that I have to commit this