Editing java classes to make it work (progress made)