13 Commits (feature/add-logging)