Started migrating some draft code to new FileSystem/FileSystem module