Closes #8. No more infinite loop hacks for mongo