Major rewrite to match sven's translations