Hammer time

Upgrading works in progress