Add some functions to existing server-side

In Progress