Did a lot of modeling

So no commits made last 7 hours