File listing is working, less hardcoded stuff replaced with more hardcoded stuff