Started refactoring, added logging to server logs