CPPtoJava Now implemented properly