Get the new disk attach functionality working (needs testing)