adding model objects, cleaning up type computations.