Add log
Fix FileSystem (WIP)