huge commit

So finale Version