#61 First steps to a better upgrade process