Substrate button wip
Substrate saving correct filetype
Correct disposal of Substrate