GridFS refactored, mostly works