Cleaned up disk resetting code, disk is no longer deleted, it is moved back, and user interaction re-enabled
Added support for multiple levels
Merge remote-tracking branch 'origin/master' into master2