[WIP] Support for logout options

@steved555 thoughts?