Translation to 2.0

Wierdo if this doesn't work. This looks be still open.