Initial

Adopt some stuff to work better in Germany