Brush the dust off this code
Add native BSON for development