Consolidate bender setup, fix bug where server needs to be passed