Support more types
Be less restrictive
Fix problem with attempting to load when we have already loaded everything.
Add folder type.