I actually did the bulk of this work ages ago with some recent tweaking to Jazz done. Even without p