Synching changes before meeting #2

I was trying some stuff out yesterday and I want to get my changes committed before we start meeting #2.