[jw1224]

See my edit for more info. (Just ironing out a couple of other issues I've found, so might update it again shortly)