Simplify & work towards correctness.