cleaned out print statements. Refactored disk(s) to be created the same way as other models. Fixed wait_for on disks to properly work.