options and additional functionality added.
not yet tested.