Remove duplicate test.
Retire TODO.
Use @attribute instead of #attribute.

Still trying to decide which is the best way to go on this.
Check that existing output file is actually a file.
Add comments, rename two methods.