Work on install and upgrade process