[echelon]

We'll just rebuild stuff when we get new requirements. The models will be even faster and better for the next version, anyway.