Rewrite of filesystem, added some logging