Cask Format Overhaul

This will break some pulls which I'll deal with after the merge.