Started wiring up the new disk based stuff