Add/Fix

* toying with idea of jms queue to do splitting... we'll see