More JABBA work (not finished yet)