Some cleanup, and start preliminary implementation of buildModel