Small refactors, model additions, and new landing a module.