Add todo item
Refactor code to use modules and share code between commands