Updating tabletop
Add proxy support per #8