Update Options Framework to use classes.  Large code refactor.