The original code where we had a model for this was cleaner IMO- we are going to want to play with this soon (for memory, cpu constraints)