Master

New java classes