In Progress

Add some functions to existing server-side