Initial pass at adding i18n and proper object disposal