Implementing translations, fixing bugs
Commit new class and files