New model builder
Took all builder logic out of model and put it into new ModelBuilder class.