Review/Update/Translate

This is a WIP but if it's good enough it can be merged. I'll continue to push to this branch when I have something new.