First real update, roughly set up to support MongoDB