1st pass

I sent this off to Jon to see if this is what he wanted.

1st pass