WIP: overlays & server decoupling.