working on event handlers, etc
hmerge with upstream/ws-4