Lots of Commands ServerSide
fixed merges