Add -server  flag and other stuff