rolling back to the previous version of the options framework

new version is still too buggy