Start of improved file system (trying new style too!)