Working towards file-system flexibility (full dynamic load)
Whoops last commit didn't go all the way through