Housekeeping for TODO and Util.
Options as a class, first step.