WIP - working my way down the params list
Style fixes
Add another option, server_user