Server rewrite closes #17