inserted buttons
switch implemented
proxy commented out