integrated todo into master