work on i18n
work on modularizing the code