Beginned server side refactoring