Added components for disks
Added some error handling.