[SP] Some JK2 work until things are a bit more clean.  May not compile.