Fixed the translator and started testing

for now it looks good, except for some changes we need to make