Started to implement prettier client/server