Second commit

I'm not finished either ... this is what I had