Updated to load folders (hopefully)