In-place upgrade path

This is current status: