4 Commits (refactor/server)