Adding a bit of server side