17 Commits (feature/strong-typing-refactor)