More changes and methods in switch method and GS

also in client to see if it works.
DeleteEvent

not done yet.