5 Commits (feature/inference-refactor)