Enterprise 2.0

Lotta updates.