Fold this into the directory creation step above