1.1

I think we are ready to merge these...