8 Commits (fix/todo)