#9 start of refactor to be more native mongodb