@pmclanahan what do you think? split up the code as I suggested? something else?