updated options

accounts for everything in user functions

setting up client handler for new options