first pass integrating jerels stuff