Better now?

This needs a serious check, I think. First commit from me.