hefty commit full of models and associations