Upgrading

Huge amount of changes