Server function naming, still not happy with server stuff though.

6 files changed