7 Commits (feature/name-resolution)