reorg/cleanup
fixed bug not checking for .end()
more reorg
JMC pipeline mostly re-created