Ununify d2jf
Fix derp
Merge pull request #32 from nicklovell23/lp5.0

Ununify d2 jf