Begin implementing persistence in File System and other minor changes.