+I10N + switch to OOP