mmalecki: I started a branch, but I got me some servers to code. Might re-visit it later.