[wip] 3.0 started making bake model work again

I started refactoring bake model, and made some progress. However when you choose to add associations, it errors out.