Bringing all of the solutions inline in terms of model construction.