Intermediate checkin, probably doesn't compile. VFS work.