Add (fake) option list.
Add support for integer options.
Minor API Fix in Calculator.Settings.
Add support for rate input.

Also reverted Calculator to previous state.
Add real options.