Very rough refactor to remove jcores please review
Merge remote-tracking branch 'origin/no-jcores' into develop