Final hackaton commit
Add scripts to upgrade
Resolve conflicts