Making lots of progress, finally able to partially analyse java with the new adds