Added two classes

*Added Option
*Added OptionsHandler
Changed variables