Options system

Changes in the options system, not working version