Working on making folder creation more robust