Tidied up TODO notes; began overlap-add