14 Commits (backend-refactor)