Redo initial
resolve conflicts
fix merge conflict
Entity with bson reader, writer, and form. Test route for futures/asynchronous actions