Finished server side refactor