This will address #510. It needs thorough testing and is a WiP but is a start to improve cron runtime and DB loads.