Adds Failsafe testing and modifies file names to allow autoexec