Refactor stuff, add American version.