Added some stuff from a class mate who is having trouble.