Feat/mongo

merging into master