12 Commits (pr-feature/add-logging)