Added TODO and Translation stubs